diff --git a/demo/testcode.html b/demo/testcode.html
index cda794b..84f6d45 100644
--- a/demo/testcode.html
+++ b/demo/testcode.html
@@ -36,7 +36,7 @@
 
       Integer myInt = 8 - 7++;
 
-      public List<String> myString { get; set; }
+      public List&lt;String&gt; myString { get; set; }
 
       List&lt;Opportunity&gt; opps = [SELECT Id FROM Opportunity WHERE Id NOT IN :newRecordsMap.keySet()];
 
@@ -55,6 +55,8 @@
       }
       System.URL.getCurrentRequestUrl();
       System.getCurrentRequestUrl();
+
+      public List&lt;SelectOption&gt; recordTypes { get; private set; }
     </code></pre>
     <p>-------NEW LANGUAGE----------</p>
 		<pre><code class="language-apex">
diff --git a/dist/apex.es.min.js b/dist/apex.es.min.js
index c300d6f..cb3a70c 100644
--- a/dist/apex.es.min.js
+++ b/dist/apex.es.min.js
@@ -22,61 +22,57 @@ match:[/\b/,t.either(...u),/\./,a,/(?=\()/],scope:{2:"title.class",
 scope:{2:"title.class"},relevance:4},{
 match:[/\b/,t.either("Callable","Comparable","Comparator","HttpCalloutMock","InstallHandler","Queueable","QueueableContext","SandboxPostCopy","Schedulable","SchedulableContext","StubProvider","UninstallHandler","WebServiceMock"),/\b/],
 scope:{2:"title.class.inherited"},relevance:8}],S={match:[/\bswitch\s+on\s+/,a],
-scope:{1:"keyword",2:"variable"}},A={
-match:t.concat(t.either(/(?<!=|!)\=(?!=|>)/,/--/,/\+\+/,/&&|\|\|/,/\*=|\/=|%=|\+=|-=/,/\&=|\^=|<<=|>>=|>>>=|\|=/,/\&|~|\^|\|/,/%[^%]|\*[^\/]|\/[^\/\*]|(?<!\-)\-(?!\-)|(?<!\+)\+(?!\+)/,/<<|>>/,/<=|>=|\s(<|>)\s/,/==|!=/,/=>/,/!(?=\w)/,/\&\&/,/(?<=\s)(\?|:)(?=\s)/,/\?\./,/(?<!\?)\?(?!\?|\.|\[)/),"{1}"),
-scope:"operator",relevance:0},E={match:t.either(/(\{|\})/,",",/\(|\)/,";"),
-scope:"punctuation",relevance:0},g=e.COMMENT("//",/[$\n]/,{relevance:0
-}),T=e.COMMENT("/\\*","\\*/",{relevance:0,contains:[{begin:/\w+@/,relevance:0},{
+scope:{1:"keyword",2:"variable"}
+},A=[/(?<!=|!)\=(?!=|>)/,/--/,/\+\+/,/&&|\|\|/,/\*=|\/=|%=|\+=|-=/,/\&=|\^=|<<=|>>=|>>>=|\|=/,/\&|~|\^|\|/,/%[^%]|\*[^\/]|\/[^\/\*]|(?<!\-)\-(?!\-)|(?<!\+)\+(?!\+)/,/<<|>>/,/<=|>=|\s(<|>)\s/,/==|!=/,/=>/,/!(?=\w)/,/\&\&/,/(?<=\s)(\?|:)(?=\s)/,/\?\./,/(?<!\?)\?(?!\?|\.|\[)/],E={
+match:t.concat(t.either(...A),"{1}"),scope:"operator",relevance:0},g={
+match:t.either(/(\{|\})/,",",/\(|\)/,";"),scope:"punctuation",relevance:0
+},v=e.COMMENT("//",/[$\n]/,{relevance:0}),T=e.COMMENT("/\\*","\\*/",{
+relevance:0,contains:[{begin:/\w+@/,relevance:0},{
 match:[/@(?:exception|throws)/,/\s+/,a],scope:{1:"doctag",3:"class.title"}},{
 begin:/@[A-Za-z_]+\s/,scope:"doctag"},{begin:"`",end:"`",excludeBegin:!0,
 excludeEnd:!0,scope:"code",contains:[e.BACKSLASH_ESCAPE],relevance:0
-},e.inherit(e.APOS_STRING_MODE,{className:"meta string"}),{
-match:[/(?<=@param)/,/\s+/,/\S+/],scope:{3:"variable"}}]}),v=[{
+},e.inherit(e.APOS_STRING_MODE,{scope:"meta string"}),{
+match:[/(?<=@param)/,/\s+/,/\S+/],scope:{3:"variable"}}]}),R=[{
 match:t.concat(n,/\b(?!\s*\()/),scope:"meta"},{begin:[t.concat(n,/\b/),/\s*\(/],
 beginScope:{1:"meta",2:"punctuation"},end:/\)/,endScope:"punctuation",
 scope:"annotation",contains:[{match:[t.concat(/\b/,a),/(?=\s*=)/],scope:{
-1:"meta keyword"},contains:[A]},e.inherit(e.APOS_STRING_MODE,{
-className:"meta string"}),c],keywords:{literal:i}}],R=[{
+1:"meta keyword"},contains:[E]},e.inherit(e.APOS_STRING_MODE,{
+scope:"meta string"}),c],keywords:{literal:i}}],_=[{
 match:[/\b[a-zA-Z0-9\.]*Exception\b/,/\s+/,a],scope:{1:"title.class",
-3:"variable"},relevance:0}],_=[{scope:"collection",
+3:"variable"},relevance:0}],O=[{scope:"collection",
 begin:/\b(list|set|map)\s*(?=<)/,beginScope:"type",end:/>+/,
-endScope:"punctuation",contains:[{match:/</,scope:"punctuation"},E,{
+endScope:"punctuation",contains:[{match:/</,scope:"punctuation"},g,{
 match:t.concat(/\b/,a,/\b/),scope:"type"}],relevance:10},{match:[a,/\s*\[\]/],
-scope:{1:"type",2:"punctuation"},contains:[E],relevance:0}],O={
-scope:"assignment",relevance:0,contains:[E,A],variants:[{
+scope:{1:"type",2:"punctuation"},contains:[g],relevance:0}],N={
+scope:"assignment",relevance:0,contains:[g,E],variants:[{
 match:[a,/\s+/,a,/(?=\s*\=)/],scope:{1:"type",3:"variable assigned"}},{
 match:[a,/\s+/,a,/\s+/,";"],scope:{1:"type",3:"variable declare"}},{
 match:[/(?<!\.)\b/,a,/(?=\s*\=)/],scope:{2:"variable mynum"}},{
 match:[/(?<==)\s*/,/\(/,a,/\)/],scope:{2:"punctuation",3:"type",4:"punctuation"}
 }]};t.concat(/\b/,a,/__(c|pc|r|b|e|mdt|x|share|kav|ka|history|del|s)/,/\b/)
-;const N=[{match:[a,t.concat(/\b/,a,/\b[ \n\t]*/),/\{/],scope:{1:"type",
-2:"property"}},{match:[t.concat(/\b/,a,/\b/),/[ \n\t]*\{/],scope:{1:"property"}
-}],y={scope:"params",begin:/\(/,beginScope:"punctuation",end:/\)/,
-endScope:"punctuation",endsParent:!0,relevance:0,
-contains:[c,e.APOS_STRING_MODE,g,T,A,O,_,m,h,{
+;const y={scope:"params",begin:/\(/,end:/\)/,endsParent:!0,relevance:0,
+contains:[c,e.APOS_STRING_MODE,v,T,E,N,O,m,h,m,c,{
 match:[t.concat(/(?<=[,\(])\s*/,a),/\./,a,/\s*(?=[,)])/],scope:{1:"variable",
 3:"variable"}},{match:[t.concat(/\b/,a),/\s+/,a,/\s*(?=[,)])/],scope:{1:"type",
-3:"variable"}},{match:[a,/\s*(?=[,)])/],scope:{1:"variable"}}]},D=[{
+3:"variable"}},{match:[a,/\s*(?=[,)])/],scope:{1:"variable"}}]},I=[{
 begin:[/\bnew\b/,/\s+/,a,/\s*(?=\()/],beginScope:{1:"keyword",
 3:"title.function.invoke"},end:/\)/,returnEnd:!0,scope:"instantiate",
-contains:[y,g,E],illegal:":",relevance:0}],I={end:/(?=\)\s*[^{])/,returnEnd:!0,
+contains:[y,v,g],illegal:":",relevance:0}],D={end:/(?=\)\s*[^{])/,returnEnd:!0,
 scope:"method_call",relevance:0,variants:[{begin:t.concat(a,/(?=\s*\()/),
 beginScope:"title.function.invoke"},{
 begin:[t.either(...p),/\./,t.concat(a,/(?=\s*\()/)],beginScope:{1:"built_in",
 3:"title.function.invoke"}},{begin:[a,/\./,t.concat(a,/(?=\s*\()/)],beginScope:{
 1:"class.title",3:"title.function.invoke"}}],
-contains:[g,T,e.APOS_STRING_MODE,y,D],relevance:0,illegal:[].concat(...s)},C={
-match:[/\bTrigger\b/,/\./,t.either("isExecuting","isInsert","isUpdate","isDelete","isBefore","isAfter","isUndelete","new","newMap","old","oldMap","size","operationType"),/\b/],
-scope:{1:"built_in",3:"keyword"},relevance:10},L={
-begin:[/\btrigger/,/\s+/,a,/\s+/,"on",/\s+/,a],beginScope:{1:"keyword",
+contains:[v,T,e.APOS_STRING_MODE,y,I,"self"],relevance:0,illegal:[].concat(...s)
+},C={begin:[/\btrigger/,/\s+/,a,/\s+/,"on",/\s+/,a],beginScope:{1:"keyword",
 3:"title.class",5:"operator",7:"type"},end:"{",returnEnd:!0,
-scope:"trigger_declaration",contains:[g,T,{begin:/\(/,beginScope:"punctuation",
+scope:"trigger_declaration",contains:[v,T,{begin:/\(/,beginScope:"punctuation",
 end:/\)/,endScope:"punctuation",scope:"trigger_params",contains:[{
 match:/\b(before|after)\s+(insert|update|delete|merge|undelete)\b/,
-scope:"built_in"}]}]},M={beginKeywords:"class",returnBegin:!0,end:/\{/,
-endScope:"punctuation",returnEnd:!0,scope:"class_declaration",keywords:{type:r,
-keyword:s},contains:[{match:[/(?<=\bclass\b)\s+/,a],scope:{2:"title.class"}},{
-returnEnd:!0,endsWithParent:!0,variants:[{beginKeywords:"implements",
+scope:"built_in"}]}]},L={begin:/\bclass\b/,beginScope:"keyword",end:/\{/,
+endScope:"punctuation",scope:"class_declaration",keywords:{type:r,keyword:s},
+contains:[{match:[/(?<=\bclass\b)\s+/,a],scope:{2:"title.class"}},{returnEnd:!0,
+endsWithParent:!0,variants:[{beginKeywords:"implements",
 end:/(\b(extends)\b)|\{/,scope:"implements block"},{beginKeywords:"extends",
 end:/(\b(implements)\b)|\{/,scope:"extends block"}],contains:[{match:/\<|\>/,
 scope:"punctuation"},{match:t.concat(/\b/,t.either(...p),/\b\s*(?!<>)/),
@@ -84,20 +80,21 @@ scope:"built_in"},{match:[/\b/,a,/\./,a,/(?=[,\s<])/],scope:{2:"built_in",
 4:"title.class.inherited"}},{match:[/\b/,a,/(?=>)/],scope:{2:"type"}},{
 match:t.concat(/\b/,a,/\b(?!<)/),scope:"title.class.inherited"},{
 match:t.concat(/\b/,t.either(...b),/\b\s*(?!>)/),scope:"title.class.inherited"}]
-}]},U=[L,{relevance:10,match:/\b(with|without|inherited)\s+sharing\b/,
-scope:"keyword"},C,{begin:[/\benum\s+/,a,/\s*/,/\{/],beginScope:{1:"type",
-2:"type"},end:/[\}\n]/,returnEnd:!0,scope:"enum_declaration",relevance:0,
-contains:[g,T,E,{match:t.concat(/\b/,a,/\b/),scope:"variable.constant"}]
-},M].concat(N),w=[{match:[/(?<=\breturn\b)\s+/,t.either(i),/(?=\s*;)/],scope:{
-2:"literal"}},{match:[/(?<=\breturn\b)/,/\s+/,a,/(?=\s*;)/],scope:{3:"variable"}
-},{match:[/(?<=\breturn\b)/,/\s+/,t.lookahead(a+/\(/)],scope:{
-2:"title.function.invoke"}}],f={begin:[/\[/,/\s*/,/\b(SELECT|FIND)\b/],
-beginScope:{1:"punctuation",3:"keyword soql"},end:/\]/,
-endScope:"punctuation outer",scope:"soql",relevance:10,contains:[{
-begin:[/\bFROM\b/,t.concat(/\s+/,a,/\b/)],beginScope:{1:"keyword",2:"type"},
-scope:"from_clause",end:/(?=\]|\s)/,contains:[{match:[/(?<=\.)/,a,/\b/],scope:{
-2:"type"}},E]},{match:/\]/,scope:"punctuation",endsParent:!0},{
-match:/\b\s*IN|=\s*:/,scope:"operator"},{
+}]},M=[C,{relevance:10,match:/\b(with|without|inherited)\s+sharing\b/,
+scope:"keyword"},{
+match:[/\bTrigger/,/\./,/(isExecuting|isInsert|isUpdate|isDelete|isBefore|isAfter|isUndelete|new|newMap|old|oldMap|size|operationType)\b/],
+scope:{1:"built_in",3:"keyword"},relevance:10},{
+begin:[/\benum\s+/,a,/\s*/,/\{/],beginScope:{1:"type",2:"type"},end:/[\}\n]/,
+returnEnd:!0,scope:"enum_declaration",relevance:0,contains:[v,T,g,{
+match:t.concat(/\b/,a,/\b/),scope:"variable.constant"}]},L],U=[{
+match:[/\breturn\b/,/\s+/,a,";"],scope:{3:"variable"}},{
+match:[/\breturn\b/,/\s+/,t.lookahead(a+/\(/)],scope:{2:"title.function.invoke"}
+}],w={begin:[/\[/,/\s*/,/\b(SELECT|FIND)\b/],beginScope:{1:"punctuation",
+3:"keyword soql"},end:/\]/,endScope:"punctuation outer",scope:"soql",
+relevance:10,contains:[{begin:[/\bFROM\b/,t.concat(/\s+/,a,/\b/)],beginScope:{
+1:"keyword",2:"type"},scope:"from_clause",end:/(?=\]|\s)/,contains:[{
+match:[/(?<=\.)/,a,/\b/],scope:{2:"type"}},g]},{match:/\]/,scope:"punctuation",
+endsParent:!0},{match:/\b\s*IN|=\s*:/,scope:"operator"},{
 begin:t.concat(/\b/,t.either("ABOVE_OR_BELOW","ACTIVE","ADVANCED","ALL","ANY","ARRAY","AS","BY","CATEGORY","CONTAINS","CUSTOM","DATA","DIVISION","END","FIELDS","FIND","FROM","LAST","METADATA","NETWORK","ON","RETURNING","ROLLUP","ROWS","SEARCH","SELECT","SNIPPET","SORT","STANDARD","USER_MODE","WHERE",/USING\s+SCOPE\s*(Delegated|Everything|Mine|My_Territory|My_Team_Territory|Team)/,/WITH\s+SECURITY_ENFORCED/),/\b/),
 scope:"keyword soql",relevance:0},{
 match:t.concat(/\b/,t.either("ABOVE","AND","ASC","AT","DESC","HAVING","IN","LIKE","LIMIT","LISTVIEW","NOT","OFFSET","OR","TRACKING","TYPEOF","UPDATE","VIEWSTAT",/FOR\s+REFERENCE/,/FOR\s+UPDATE/,/FOR\s+VIEW/,/GROUP\s+BY/,/NOT\s+IN/,/NULLS\s+(FIRST|LAST)/,/ORDER\s+BY/,/WITH/,/DATA\s+CATEGORY/,/WITH\s+PricebookId/),/\b/),
@@ -110,23 +107,24 @@ match:/(NEXT|LAST|THIS)_(90_DAY|DAY|FISCAL_QUARTER|FISCAL_YEAR|MONTH|QUARTER|WEE
 scope:"variable.language",relevance:10},{
 match:[/(NEXT|LAST)_N_(DAY|FISCAL_QUARTER|FISCAL_YEAR|MONTH|QUARTER|WEEK|YEAR)S/,/\s*:\s*/,/\d+/],
 scope:{1:"variable.language",2:"operator",3:"number"},relevance:10},{
-match:[/(?<=:)/,/\s*/,a],scope:{3:"variable"}},c,I,A,E,e.APOS_STRING_MODE],
-illegal:"::"},k={begin:[/\bfor\b\s*/,/\(/,a,/\s+/,a,/\s*:/],beginScope:{
-2:"punctuation",3:"type",5:"variable for",6:"operator"},scope:"for_loop",
-end:/\)\s*\{/,endScope:"punctuation",contains:[g,T,f,I,{
-match:t.concat(a,/\b(?!\()/),scope:"variable"}],METHOD_CALL:I,PUNCTUATION:E}
-;return{name:"Apex",aliases:["apex","lightning","soql"],case_insensitive:!0,
+match:[/(?<=:)/,/\s*/,a],scope:{3:"variable"}},c,D,E,g,e.APOS_STRING_MODE],
+illegal:"::"},f={begin:[/\bfor\b\s*/,/\(/,a,/\s+/,a,/\s*:/],beginScope:{
+2:"punctuation",3:"type",5:"variable for"},scope:"for_loop",end:/\)\s*\{/,
+endScope:"punctuation",contains:[v,T,w,D,{match:t.concat(a,/\b(?!\()/),
+scope:"variable"}],METHOD_CALL:D,PUNCTUATION_RE:g,OPERATOR_LIST:A};return{
+name:"Apex",aliases:["apex","lightning","soql"],case_insensitive:!0,
 disableAutodetect:!1,ignoreIllegals:!1,keywords:{$pattern:a,keyword:s,
 "variable.language":["instanceof","new","super","this"],built_in:b,type:r,
 literal:i},
-illegal:["</","<#","<]","<div>","\x3c!--","!DOCTYPE",/<iframe\b/,/^#/,/^import \.[a-zA-Z]+\./,/^import [\w]+/,/^import$/,/^include </,/^use\s+</,/\b(const|var)\s+\w+\s*=/,/\bstruct\b/,"System.log","console.log",/\bfor\s+\w+\s+IN\s+/,/\bif\s+\w+\s+IN\s+/,/\bend\s+if\b/,/\bend\s+select\b/,/\b(int|var)\s+\w+\s+=/,/\b(int[0-9]+|bool)\b/,/\b\$/,"::=",/\s#[a-zA-Z]/,/\s_[a-zA-Z]/,/\s\$[a-zA-Z]/,"#if","%if",/\bif(?!\s+\()/,"%endif","#endif",/\w::\w/,/(SELECT|RETURNING)\s+\*/,/END\s+LOOP/,/CREATE\s+FUNCTION/,/\bint\b/,/import\s+\w+\s+=\s+require\("\w+"\)/,"/^include\b/",/\buse\s+strict\b/,/\w+\s+=\s+"\S*";/,/\/include\//,/\Anamespace\b/,/\bend(\.)?\n/,'"""',/\+\+\+/,/<%/,"<%#","%%>","<%%",":-"],
-contains:[v,O,_,T,g,U,[{begin:t.concat(/\s\b/,t.either(...l),/\b\s/),
-beginScope:"built_in",end:";|$",scope:"dml",contains:[D,{
+illegal:["</","<#","<]","<div>","\x3c!--","!DOCTYPE",/<iframe\b/,/^#/,/^import \.[a-zA-Z]+\./,/^import [\w]+/,/^import$/,/^include </,/^use\s+</,/\b(const|var)\s+\w+\s*=/,/\bstruct\b/,"System.log","console.log",/\bfor\s+\w+\s+IN\s+/,/\bif\s+\w+\s+IN\s+/,/\bend\s+if\b/,/\bend\s+select\b/,/\b(int|var)\s+\w+\s+=/,/\b(int[0-9]+|bool)\b/,/\b\$/,"::=",/\s#[a-zA-Z]/,/\s_[a-zA-Z]/,/\s\$[a-zA-Z]/,"#if","%if",/\bif(?!\s+\()/,"%endif","#endif",/\w::\w/,/(SELECT|RETURNING)\s+\*/,/END\s+LOOP/,/CREATE\s+FUNCTION/,/\bint\b/,/import\s+\w+\s+=\s+require\("\w+"\)/,"/^include\b/",/\buse\s+strict\b/,/\w+\s+=\s+"\S*";/,/\/include\//,/\Anamespace\b/,/\bend(\.)?\n/,'"""',/\+\+\+/,/<%/,"<%#","%%>","<%%",":-",/\bmergesort\(/,/\bvar\s+env\b/,/\bdef\b\s\W:/,/"[^"]+"/],
+contains:[R,N,O,T,v,M,[{begin:t.concat(/\s\b/,t.either(...l),/\b\s/),
+beginScope:"built_in",end:";|$",scope:"dml",contains:[I,{
 match:/\bas\s+(user|system)\b/,scope:"keyword"},{match:[a,/\s*;/],scope:{
-1:"variable"}},E,g,f]},{begin:[/\bDatabase\b/,/\./,a,/\s*/,/\(/],beginScope:{
-1:"built_in",3:"built_in"},end:";",scope:"database_dml",
-contains:[y,m,e.APOS_STRING_MODE,T,g,{match:[/\(/,a,/,/],scope:{2:"variable"}},{
+1:"variable"}},g,v,w]},{begin:[/\bDatabase\b/,/\./,a,/\s*/,t.lookahead(/\(/)],
+beginScope:{1:"built_in",3:"built_in"},end:";",scope:"database_dml",
+contains:[y,m,e.APOS_STRING_MODE,T,v,{match:[/\(/,a,/,/],scope:{2:"variable"}},{
 match:["AccessLevel",/\./,/(SYSTEM_MODE|USER_MODE)/],scope:{1:"built_in",
-3:"keyword"}}]}],R,k,e.APOS_STRING_MODE,D,I,h,c,A,E,w,{
-match:/(?<!\.)\bId\b(?=[\s>])/,scope:"type",relevance:8},f,o,S]}}})()
-;export default hljsGrammar;
\ No newline at end of file
+3:"keyword"}}]}],_,f,e.APOS_STRING_MODE,I,D,h,c,E,g,U,{
+match:/(?<!\.)\bId\b(?=[\s>])/,scope:"type",relevance:8},w,o,S,[{
+match:[/(?<=(public|private)?\s+[\w<>,\.]+\s+)/,/[\w<>]+/,/(?=\s+\{\s*(public|private\s+)?(get|set);\s+((public|private)\s+)?(get|set);\s*\})/],
+scope:{2:"property"}}]]}}})();export default hljsGrammar;
\ No newline at end of file
diff --git a/dist/apex.min.js b/dist/apex.min.js
index 54a75b9..bc09b50 100644
--- a/dist/apex.min.js
+++ b/dist/apex.min.js
@@ -22,61 +22,57 @@ match:[/\b/,t.either(...u),/\./,a,/(?=\()/],scope:{2:"title.class",
 scope:{2:"title.class"},relevance:4},{
 match:[/\b/,t.either("Callable","Comparable","Comparator","HttpCalloutMock","InstallHandler","Queueable","QueueableContext","SandboxPostCopy","Schedulable","SchedulableContext","StubProvider","UninstallHandler","WebServiceMock"),/\b/],
 scope:{2:"title.class.inherited"},relevance:8}],S={match:[/\bswitch\s+on\s+/,a],
-scope:{1:"keyword",2:"variable"}},A={
-match:t.concat(t.either(/(?<!=|!)\=(?!=|>)/,/--/,/\+\+/,/&&|\|\|/,/\*=|\/=|%=|\+=|-=/,/\&=|\^=|<<=|>>=|>>>=|\|=/,/\&|~|\^|\|/,/%[^%]|\*[^\/]|\/[^\/\*]|(?<!\-)\-(?!\-)|(?<!\+)\+(?!\+)/,/<<|>>/,/<=|>=|\s(<|>)\s/,/==|!=/,/=>/,/!(?=\w)/,/\&\&/,/(?<=\s)(\?|:)(?=\s)/,/\?\./,/(?<!\?)\?(?!\?|\.|\[)/),"{1}"),
-scope:"operator",relevance:0},E={match:t.either(/(\{|\})/,",",/\(|\)/,";"),
-scope:"punctuation",relevance:0},g=e.COMMENT("//",/[$\n]/,{relevance:0
-}),T=e.COMMENT("/\\*","\\*/",{relevance:0,contains:[{begin:/\w+@/,relevance:0},{
+scope:{1:"keyword",2:"variable"}
+},A=[/(?<!=|!)\=(?!=|>)/,/--/,/\+\+/,/&&|\|\|/,/\*=|\/=|%=|\+=|-=/,/\&=|\^=|<<=|>>=|>>>=|\|=/,/\&|~|\^|\|/,/%[^%]|\*[^\/]|\/[^\/\*]|(?<!\-)\-(?!\-)|(?<!\+)\+(?!\+)/,/<<|>>/,/<=|>=|\s(<|>)\s/,/==|!=/,/=>/,/!(?=\w)/,/\&\&/,/(?<=\s)(\?|:)(?=\s)/,/\?\./,/(?<!\?)\?(?!\?|\.|\[)/],E={
+match:t.concat(t.either(...A),"{1}"),scope:"operator",relevance:0},g={
+match:t.either(/(\{|\})/,",",/\(|\)/,";"),scope:"punctuation",relevance:0
+},v=e.COMMENT("//",/[$\n]/,{relevance:0}),T=e.COMMENT("/\\*","\\*/",{
+relevance:0,contains:[{begin:/\w+@/,relevance:0},{
 match:[/@(?:exception|throws)/,/\s+/,a],scope:{1:"doctag",3:"class.title"}},{
 begin:/@[A-Za-z_]+\s/,scope:"doctag"},{begin:"`",end:"`",excludeBegin:!0,
 excludeEnd:!0,scope:"code",contains:[e.BACKSLASH_ESCAPE],relevance:0
-},e.inherit(e.APOS_STRING_MODE,{className:"meta string"}),{
-match:[/(?<=@param)/,/\s+/,/\S+/],scope:{3:"variable"}}]}),v=[{
+},e.inherit(e.APOS_STRING_MODE,{scope:"meta string"}),{
+match:[/(?<=@param)/,/\s+/,/\S+/],scope:{3:"variable"}}]}),R=[{
 match:t.concat(n,/\b(?!\s*\()/),scope:"meta"},{begin:[t.concat(n,/\b/),/\s*\(/],
 beginScope:{1:"meta",2:"punctuation"},end:/\)/,endScope:"punctuation",
 scope:"annotation",contains:[{match:[t.concat(/\b/,a),/(?=\s*=)/],scope:{
-1:"meta keyword"},contains:[A]},e.inherit(e.APOS_STRING_MODE,{
-className:"meta string"}),c],keywords:{literal:i}}],R=[{
+1:"meta keyword"},contains:[E]},e.inherit(e.APOS_STRING_MODE,{
+scope:"meta string"}),c],keywords:{literal:i}}],_=[{
 match:[/\b[a-zA-Z0-9\.]*Exception\b/,/\s+/,a],scope:{1:"title.class",
-3:"variable"},relevance:0}],_=[{scope:"collection",
+3:"variable"},relevance:0}],O=[{scope:"collection",
 begin:/\b(list|set|map)\s*(?=<)/,beginScope:"type",end:/>+/,
-endScope:"punctuation",contains:[{match:/</,scope:"punctuation"},E,{
+endScope:"punctuation",contains:[{match:/</,scope:"punctuation"},g,{
 match:t.concat(/\b/,a,/\b/),scope:"type"}],relevance:10},{match:[a,/\s*\[\]/],
-scope:{1:"type",2:"punctuation"},contains:[E],relevance:0}],O={
-scope:"assignment",relevance:0,contains:[E,A],variants:[{
+scope:{1:"type",2:"punctuation"},contains:[g],relevance:0}],N={
+scope:"assignment",relevance:0,contains:[g,E],variants:[{
 match:[a,/\s+/,a,/(?=\s*\=)/],scope:{1:"type",3:"variable assigned"}},{
 match:[a,/\s+/,a,/\s+/,";"],scope:{1:"type",3:"variable declare"}},{
 match:[/(?<!\.)\b/,a,/(?=\s*\=)/],scope:{2:"variable mynum"}},{
 match:[/(?<==)\s*/,/\(/,a,/\)/],scope:{2:"punctuation",3:"type",4:"punctuation"}
 }]};t.concat(/\b/,a,/__(c|pc|r|b|e|mdt|x|share|kav|ka|history|del|s)/,/\b/)
-;const N=[{match:[a,t.concat(/\b/,a,/\b[ \n\t]*/),/\{/],scope:{1:"type",
-2:"property"}},{match:[t.concat(/\b/,a,/\b/),/[ \n\t]*\{/],scope:{1:"property"}
-}],y={scope:"params",begin:/\(/,beginScope:"punctuation",end:/\)/,
-endScope:"punctuation",endsParent:!0,relevance:0,
-contains:[c,e.APOS_STRING_MODE,g,T,A,O,_,m,h,{
+;const y={scope:"params",begin:/\(/,end:/\)/,endsParent:!0,relevance:0,
+contains:[c,e.APOS_STRING_MODE,v,T,E,N,O,m,h,m,c,{
 match:[t.concat(/(?<=[,\(])\s*/,a),/\./,a,/\s*(?=[,)])/],scope:{1:"variable",
 3:"variable"}},{match:[t.concat(/\b/,a),/\s+/,a,/\s*(?=[,)])/],scope:{1:"type",
-3:"variable"}},{match:[a,/\s*(?=[,)])/],scope:{1:"variable"}}]},D=[{
+3:"variable"}},{match:[a,/\s*(?=[,)])/],scope:{1:"variable"}}]},I=[{
 begin:[/\bnew\b/,/\s+/,a,/\s*(?=\()/],beginScope:{1:"keyword",
 3:"title.function.invoke"},end:/\)/,returnEnd:!0,scope:"instantiate",
-contains:[y,g,E],illegal:":",relevance:0}],I={end:/(?=\)\s*[^{])/,returnEnd:!0,
+contains:[y,v,g],illegal:":",relevance:0}],D={end:/(?=\)\s*[^{])/,returnEnd:!0,
 scope:"method_call",relevance:0,variants:[{begin:t.concat(a,/(?=\s*\()/),
 beginScope:"title.function.invoke"},{
 begin:[t.either(...p),/\./,t.concat(a,/(?=\s*\()/)],beginScope:{1:"built_in",
 3:"title.function.invoke"}},{begin:[a,/\./,t.concat(a,/(?=\s*\()/)],beginScope:{
 1:"class.title",3:"title.function.invoke"}}],
-contains:[g,T,e.APOS_STRING_MODE,y,D],relevance:0,illegal:[].concat(...s)},C={
-match:[/\bTrigger\b/,/\./,t.either("isExecuting","isInsert","isUpdate","isDelete","isBefore","isAfter","isUndelete","new","newMap","old","oldMap","size","operationType"),/\b/],
-scope:{1:"built_in",3:"keyword"},relevance:10},L={
-begin:[/\btrigger/,/\s+/,a,/\s+/,"on",/\s+/,a],beginScope:{1:"keyword",
+contains:[v,T,e.APOS_STRING_MODE,y,I,"self"],relevance:0,illegal:[].concat(...s)
+},L={begin:[/\btrigger/,/\s+/,a,/\s+/,"on",/\s+/,a],beginScope:{1:"keyword",
 3:"title.class",5:"operator",7:"type"},end:"{",returnEnd:!0,
-scope:"trigger_declaration",contains:[g,T,{begin:/\(/,beginScope:"punctuation",
+scope:"trigger_declaration",contains:[v,T,{begin:/\(/,beginScope:"punctuation",
 end:/\)/,endScope:"punctuation",scope:"trigger_params",contains:[{
 match:/\b(before|after)\s+(insert|update|delete|merge|undelete)\b/,
-scope:"built_in"}]}]},M={beginKeywords:"class",returnBegin:!0,end:/\{/,
-endScope:"punctuation",returnEnd:!0,scope:"class_declaration",keywords:{type:r,
-keyword:s},contains:[{match:[/(?<=\bclass\b)\s+/,a],scope:{2:"title.class"}},{
-returnEnd:!0,endsWithParent:!0,variants:[{beginKeywords:"implements",
+scope:"built_in"}]}]},C={begin:/\bclass\b/,beginScope:"keyword",end:/\{/,
+endScope:"punctuation",scope:"class_declaration",keywords:{type:r,keyword:s},
+contains:[{match:[/(?<=\bclass\b)\s+/,a],scope:{2:"title.class"}},{returnEnd:!0,
+endsWithParent:!0,variants:[{beginKeywords:"implements",
 end:/(\b(extends)\b)|\{/,scope:"implements block"},{beginKeywords:"extends",
 end:/(\b(implements)\b)|\{/,scope:"extends block"}],contains:[{match:/\<|\>/,
 scope:"punctuation"},{match:t.concat(/\b/,t.either(...p),/\b\s*(?!<>)/),
@@ -84,20 +80,21 @@ scope:"built_in"},{match:[/\b/,a,/\./,a,/(?=[,\s<])/],scope:{2:"built_in",
 4:"title.class.inherited"}},{match:[/\b/,a,/(?=>)/],scope:{2:"type"}},{
 match:t.concat(/\b/,a,/\b(?!<)/),scope:"title.class.inherited"},{
 match:t.concat(/\b/,t.either(...b),/\b\s*(?!>)/),scope:"title.class.inherited"}]
-}]},U=[L,{relevance:10,match:/\b(with|without|inherited)\s+sharing\b/,
-scope:"keyword"},C,{begin:[/\benum\s+/,a,/\s*/,/\{/],beginScope:{1:"type",
-2:"type"},end:/[\}\n]/,returnEnd:!0,scope:"enum_declaration",relevance:0,
-contains:[g,T,E,{match:t.concat(/\b/,a,/\b/),scope:"variable.constant"}]
-},M].concat(N),w=[{match:[/(?<=\breturn\b)\s+/,t.either(i),/(?=\s*;)/],scope:{
-2:"literal"}},{match:[/(?<=\breturn\b)/,/\s+/,a,/(?=\s*;)/],scope:{3:"variable"}
-},{match:[/(?<=\breturn\b)/,/\s+/,t.lookahead(a+/\(/)],scope:{
-2:"title.function.invoke"}}],f={begin:[/\[/,/\s*/,/\b(SELECT|FIND)\b/],
-beginScope:{1:"punctuation",3:"keyword soql"},end:/\]/,
-endScope:"punctuation outer",scope:"soql",relevance:10,contains:[{
-begin:[/\bFROM\b/,t.concat(/\s+/,a,/\b/)],beginScope:{1:"keyword",2:"type"},
-scope:"from_clause",end:/(?=\]|\s)/,contains:[{match:[/(?<=\.)/,a,/\b/],scope:{
-2:"type"}},E]},{match:/\]/,scope:"punctuation",endsParent:!0},{
-match:/\b\s*IN|=\s*:/,scope:"operator"},{
+}]},M=[L,{relevance:10,match:/\b(with|without|inherited)\s+sharing\b/,
+scope:"keyword"},{
+match:[/\bTrigger/,/\./,/(isExecuting|isInsert|isUpdate|isDelete|isBefore|isAfter|isUndelete|new|newMap|old|oldMap|size|operationType)\b/],
+scope:{1:"built_in",3:"keyword"},relevance:10},{
+begin:[/\benum\s+/,a,/\s*/,/\{/],beginScope:{1:"type",2:"type"},end:/[\}\n]/,
+returnEnd:!0,scope:"enum_declaration",relevance:0,contains:[v,T,g,{
+match:t.concat(/\b/,a,/\b/),scope:"variable.constant"}]},C],U=[{
+match:[/\breturn\b/,/\s+/,a,";"],scope:{3:"variable"}},{
+match:[/\breturn\b/,/\s+/,t.lookahead(a+/\(/)],scope:{2:"title.function.invoke"}
+}],w={begin:[/\[/,/\s*/,/\b(SELECT|FIND)\b/],beginScope:{1:"punctuation",
+3:"keyword soql"},end:/\]/,endScope:"punctuation outer",scope:"soql",
+relevance:10,contains:[{begin:[/\bFROM\b/,t.concat(/\s+/,a,/\b/)],beginScope:{
+1:"keyword",2:"type"},scope:"from_clause",end:/(?=\]|\s)/,contains:[{
+match:[/(?<=\.)/,a,/\b/],scope:{2:"type"}},g]},{match:/\]/,scope:"punctuation",
+endsParent:!0},{match:/\b\s*IN|=\s*:/,scope:"operator"},{
 begin:t.concat(/\b/,t.either("ABOVE_OR_BELOW","ACTIVE","ADVANCED","ALL","ANY","ARRAY","AS","BY","CATEGORY","CONTAINS","CUSTOM","DATA","DIVISION","END","FIELDS","FIND","FROM","LAST","METADATA","NETWORK","ON","RETURNING","ROLLUP","ROWS","SEARCH","SELECT","SNIPPET","SORT","STANDARD","USER_MODE","WHERE",/USING\s+SCOPE\s*(Delegated|Everything|Mine|My_Territory|My_Team_Territory|Team)/,/WITH\s+SECURITY_ENFORCED/),/\b/),
 scope:"keyword soql",relevance:0},{
 match:t.concat(/\b/,t.either("ABOVE","AND","ASC","AT","DESC","HAVING","IN","LIKE","LIMIT","LISTVIEW","NOT","OFFSET","OR","TRACKING","TYPEOF","UPDATE","VIEWSTAT",/FOR\s+REFERENCE/,/FOR\s+UPDATE/,/FOR\s+VIEW/,/GROUP\s+BY/,/NOT\s+IN/,/NULLS\s+(FIRST|LAST)/,/ORDER\s+BY/,/WITH/,/DATA\s+CATEGORY/,/WITH\s+PricebookId/),/\b/),
@@ -110,23 +107,24 @@ match:/(NEXT|LAST|THIS)_(90_DAY|DAY|FISCAL_QUARTER|FISCAL_YEAR|MONTH|QUARTER|WEE
 scope:"variable.language",relevance:10},{
 match:[/(NEXT|LAST)_N_(DAY|FISCAL_QUARTER|FISCAL_YEAR|MONTH|QUARTER|WEEK|YEAR)S/,/\s*:\s*/,/\d+/],
 scope:{1:"variable.language",2:"operator",3:"number"},relevance:10},{
-match:[/(?<=:)/,/\s*/,a],scope:{3:"variable"}},c,I,A,E,e.APOS_STRING_MODE],
-illegal:"::"},k={begin:[/\bfor\b\s*/,/\(/,a,/\s+/,a,/\s*:/],beginScope:{
-2:"punctuation",3:"type",5:"variable for",6:"operator"},scope:"for_loop",
-end:/\)\s*\{/,endScope:"punctuation",contains:[g,T,f,I,{
-match:t.concat(a,/\b(?!\()/),scope:"variable"}],METHOD_CALL:I,PUNCTUATION:E}
-;return{name:"Apex",aliases:["apex","lightning","soql"],case_insensitive:!0,
+match:[/(?<=:)/,/\s*/,a],scope:{3:"variable"}},c,D,E,g,e.APOS_STRING_MODE],
+illegal:"::"},f={begin:[/\bfor\b\s*/,/\(/,a,/\s+/,a,/\s*:/],beginScope:{
+2:"punctuation",3:"type",5:"variable for"},scope:"for_loop",end:/\)\s*\{/,
+endScope:"punctuation",contains:[v,T,w,D,{match:t.concat(a,/\b(?!\()/),
+scope:"variable"}],METHOD_CALL:D,PUNCTUATION_RE:g,OPERATOR_LIST:A};return{
+name:"Apex",aliases:["apex","lightning","soql"],case_insensitive:!0,
 disableAutodetect:!1,ignoreIllegals:!1,keywords:{$pattern:a,keyword:s,
 "variable.language":["instanceof","new","super","this"],built_in:b,type:r,
 literal:i},
-illegal:["</","<#","<]","<div>","\x3c!--","!DOCTYPE",/<iframe\b/,/^#/,/^import \.[a-zA-Z]+\./,/^import [\w]+/,/^import$/,/^include </,/^use\s+</,/\b(const|var)\s+\w+\s*=/,/\bstruct\b/,"System.log","console.log",/\bfor\s+\w+\s+IN\s+/,/\bif\s+\w+\s+IN\s+/,/\bend\s+if\b/,/\bend\s+select\b/,/\b(int|var)\s+\w+\s+=/,/\b(int[0-9]+|bool)\b/,/\b\$/,"::=",/\s#[a-zA-Z]/,/\s_[a-zA-Z]/,/\s\$[a-zA-Z]/,"#if","%if",/\bif(?!\s+\()/,"%endif","#endif",/\w::\w/,/(SELECT|RETURNING)\s+\*/,/END\s+LOOP/,/CREATE\s+FUNCTION/,/\bint\b/,/import\s+\w+\s+=\s+require\("\w+"\)/,"/^include\b/",/\buse\s+strict\b/,/\w+\s+=\s+"\S*";/,/\/include\//,/\Anamespace\b/,/\bend(\.)?\n/,'"""',/\+\+\+/,/<%/,"<%#","%%>","<%%",":-"],
-contains:[v,O,_,T,g,U,[{begin:t.concat(/\s\b/,t.either(...l),/\b\s/),
-beginScope:"built_in",end:";|$",scope:"dml",contains:[D,{
+illegal:["</","<#","<]","<div>","\x3c!--","!DOCTYPE",/<iframe\b/,/^#/,/^import \.[a-zA-Z]+\./,/^import [\w]+/,/^import$/,/^include </,/^use\s+</,/\b(const|var)\s+\w+\s*=/,/\bstruct\b/,"System.log","console.log",/\bfor\s+\w+\s+IN\s+/,/\bif\s+\w+\s+IN\s+/,/\bend\s+if\b/,/\bend\s+select\b/,/\b(int|var)\s+\w+\s+=/,/\b(int[0-9]+|bool)\b/,/\b\$/,"::=",/\s#[a-zA-Z]/,/\s_[a-zA-Z]/,/\s\$[a-zA-Z]/,"#if","%if",/\bif(?!\s+\()/,"%endif","#endif",/\w::\w/,/(SELECT|RETURNING)\s+\*/,/END\s+LOOP/,/CREATE\s+FUNCTION/,/\bint\b/,/import\s+\w+\s+=\s+require\("\w+"\)/,"/^include\b/",/\buse\s+strict\b/,/\w+\s+=\s+"\S*";/,/\/include\//,/\Anamespace\b/,/\bend(\.)?\n/,'"""',/\+\+\+/,/<%/,"<%#","%%>","<%%",":-",/\bmergesort\(/,/\bvar\s+env\b/,/\bdef\b\s\W:/,/"[^"]+"/],
+contains:[R,N,O,T,v,M,[{begin:t.concat(/\s\b/,t.either(...l),/\b\s/),
+beginScope:"built_in",end:";|$",scope:"dml",contains:[I,{
 match:/\bas\s+(user|system)\b/,scope:"keyword"},{match:[a,/\s*;/],scope:{
-1:"variable"}},E,g,f]},{begin:[/\bDatabase\b/,/\./,a,/\s*/,/\(/],beginScope:{
-1:"built_in",3:"built_in"},end:";",scope:"database_dml",
-contains:[y,m,e.APOS_STRING_MODE,T,g,{match:[/\(/,a,/,/],scope:{2:"variable"}},{
+1:"variable"}},g,v,w]},{begin:[/\bDatabase\b/,/\./,a,/\s*/,t.lookahead(/\(/)],
+beginScope:{1:"built_in",3:"built_in"},end:";",scope:"database_dml",
+contains:[y,m,e.APOS_STRING_MODE,T,v,{match:[/\(/,a,/,/],scope:{2:"variable"}},{
 match:["AccessLevel",/\./,/(SYSTEM_MODE|USER_MODE)/],scope:{1:"built_in",
-3:"keyword"}}]}],R,k,e.APOS_STRING_MODE,D,I,h,c,A,E,w,{
-match:/(?<!\.)\bId\b(?=[\s>])/,scope:"type",relevance:8},f,o,S]}}})()
-;hljs.registerLanguage("apex",e)})();
\ No newline at end of file
+3:"keyword"}}]}],_,f,e.APOS_STRING_MODE,I,D,h,c,E,g,U,{
+match:/(?<!\.)\bId\b(?=[\s>])/,scope:"type",relevance:8},w,o,S,[{
+match:[/(?<=(public|private)?\s+[\w<>,\.]+\s+)/,/[\w<>]+/,/(?=\s+\{\s*(public|private\s+)?(get|set);\s+((public|private)\s+)?(get|set);\s*\})/],
+scope:{2:"property"}}]]}}})();hljs.registerLanguage("apex",e)})();
\ No newline at end of file
diff --git a/src/languages/apex.js b/src/languages/apex.js
index cbca50b..43f867b 100644
--- a/src/languages/apex.js
+++ b/src/languages/apex.js
@@ -28,7 +28,7 @@ export default function (hljs) {
     relevance: 0
   };
 
-  const MAIN_KEYWORDS = [
+  const MAIN_KEYWORD_LIST = [
     'cast',
     'default',
     'export',
@@ -58,7 +58,7 @@ export default function (hljs) {
     'when'
   ];
 
-  const LANGUAGE_VARS = ['instanceof', 'new', 'super', 'this'];
+  const LANGUAGE_VAR_LIST = ['instanceof', 'new', 'super', 'this'];
 
   // keyword
   const STORAGE_MODIFIER_LIST = [
@@ -77,7 +77,7 @@ export default function (hljs) {
     'webservice'
   ];
 
-  const STORAGE_MODIFIER = {
+  const STORAGE_MODIFIER_RE = {
     match: regex.concat(
       /(?<!\.)\b/,
       regex.either(...STORAGE_MODIFIER_LIST),
@@ -313,7 +313,7 @@ export default function (hljs) {
     'WebServiceMock'
   ];
 
-  const LITERAL_REGEX = {
+  const LITERAL_RE = {
     match: regex.concat(/\b/, regex.either(...LITERALS), /\b\s*(?=[,)])/),
     scope: 'literal regex',
     relevance: 0
@@ -397,7 +397,7 @@ export default function (hljs) {
     scope: { 1: 'keyword', 2: 'variable' }
   };
 
-  const OPERATOR_REGEX = [
+  const OPERATOR_LIST = [
     //=/,
     //(?<=')\s*\+/, // string concat before
     //\+(?=\s*')/, // string concat after
@@ -424,14 +424,14 @@ export default function (hljs) {
     /(?<!\?)\?(?!\?|\.|\[)/ // ternary operator or CONDITIONAL_OPERATOR 
   ];
 
-  const OPERATORS = {
-    match: regex.concat( regex.either(...OPERATOR_REGEX), '{1}'),
+  const OPERATOR_RE = {
+    match: regex.concat( regex.either(...OPERATOR_LIST), '{1}'),
     //match: /((?<!\+)\+(?!\+)|(\=)){1}/,
     scope: 'operator',
     relevance: 0
   };
 
-  const PUNCTUATION_REGEX = [
+  const PUNCTUATION_LIST = [
     /(\{|\})/,
     ',',
     /\(|\)/,
@@ -440,8 +440,8 @@ export default function (hljs) {
     // /(?<!\?)\./ //"Period/dot"
   ];
 
-  const PUNCTUATION = {
-    match: regex.either(...PUNCTUATION_REGEX),
+  const PUNCTUATION_RE = {
+    match: regex.either(...PUNCTUATION_LIST),
     scope: 'punctuation',
     relevance: 0
   };
@@ -475,7 +475,7 @@ export default function (hljs) {
         contains: [hljs.BACKSLASH_ESCAPE],
         relevance: 0
       },
-      hljs.inherit(hljs.APOS_STRING_MODE, { className: 'meta string' }),
+      hljs.inherit(hljs.APOS_STRING_MODE, { scope: 'meta string' }),
       {
         match: [/(?<=@param)/, /\s+/, /\S+/],
         scope: {
@@ -541,9 +541,9 @@ export default function (hljs) {
           scope: {
             1: 'meta keyword' //,2: 'operator'
           },
-          contains: [OPERATORS]
+          contains: [OPERATOR_RE]
         },
-        hljs.inherit(hljs.APOS_STRING_MODE, { className: 'meta string' }),
+        hljs.inherit(hljs.APOS_STRING_MODE, { scope: 'meta string' }),
         NUMBERS
       ],
       keywords: {
@@ -573,7 +573,7 @@ export default function (hljs) {
           match: /</,
           scope: 'punctuation'
         },
-        PUNCTUATION,
+        PUNCTUATION_RE,
         {
           match: regex.concat(/\b/, APEX_IDENT_RE, /\b/),
           scope: 'type'
@@ -588,7 +588,7 @@ export default function (hljs) {
         1: 'type',
         2: 'punctuation'
       },
-      contains: [PUNCTUATION],
+      contains: [PUNCTUATION_RE],
       relevance: 0
     }
   ];
@@ -596,7 +596,7 @@ export default function (hljs) {
   const ASSIGNMENTS = {
     scope: 'assignment',
     relevance: 0,
-    contains: [PUNCTUATION, OPERATORS],
+    contains: [PUNCTUATION_RE, OPERATOR_RE],
     variants: [
     {
       // Account a =
@@ -648,33 +648,26 @@ export default function (hljs) {
     relevance: 10
   };
 
-  const PROPERTY_DECLARATION = [
+  const VISUALFORCE_PROPERTY = [
+    // public String myString { get; private set;}
+    // for now, we handle only single lines
     {
-      // non-collection property
-      match: [
-        APEX_IDENT_RE,
-        regex.concat(/\b/, APEX_IDENT_RE, /\b[ \n\t]*/),
-        /\{/,
-//        /[ \n\t]*(public|private)?[ \n\t]+(get|set)\b/
-      ],
-      scope: { 1: 'type', 2: 'property' }
-    },
-    {
-      // all other properties
-      match: [
-        regex.concat(/\b/, APEX_IDENT_RE, /\b/),
-        /[ \n\t]*\{/ //[ \n\t]*(public|private)?[ \n\t]+(get|set)\b/
-      ],
-      scope: { 1: 'property' }
+      match: [  /(?<=(public|private)?\s+[\w<>,\.]+\s+)/,
+        /[\w<>]+/,
+        /(?=\s+\{\s*(public|private\s+)?(get|set);\s+((public|private)\s+)?(get|set);\s*\})/],
+      scope: {
+        //2: 'type',
+        2: 'property'
+      }
     }
   ];
 
   const PARAMS = {
     scope: 'params',
     begin: /\(/,
-    beginScope: 'punctuation',
+    //beginScope: 'punctuation',
     end: /\)/,
-    endScope: 'punctuation',
+    //endScope: 'punctuation',
     endsParent: true,
     relevance: 0,
     contains: [
@@ -682,11 +675,12 @@ export default function (hljs) {
       hljs.APOS_STRING_MODE,
       COMMENT_LINE,
       COMMENT_BLOCK,
-      OPERATORS,
+      OPERATOR_RE,
       ASSIGNMENTS,
       COLLECTION_DECLARATION,
-      LITERAL_REGEX,
+      LITERAL_RE,
       NAMESPACES,
+      LITERAL_RE, NUMBERS,
       //'self',
       {
         // mymethod(c.Id, c.Name); highlights each part of each parameter
@@ -730,7 +724,7 @@ export default function (hljs) {
       returnEnd: true,
       //endScope: 'punctuation',
       scope: 'instantiate',
-      contains: [PARAMS, COMMENT_LINE, PUNCTUATION],
+      contains: [PARAMS, COMMENT_LINE, PUNCTUATION_RE],
       illegal: ':',
       relevance: 0
     }
@@ -766,33 +760,17 @@ export default function (hljs) {
       COMMENT_BLOCK,
       hljs.APOS_STRING_MODE,
       PARAMS,
-      INSTANTIATE
+      INSTANTIATE,
+      "self",
     ],
     relevance: 0,
-    illegal: [].concat(...MAIN_KEYWORDS)
+    illegal: [].concat(...MAIN_KEYWORD_LIST)
   };
 
   // * TRIGGER DECLARATION
 
-  const TRIGGER_PROPERTIES = [
-    // will be scoped as keywords
-    'isExecuting',
-    'isInsert',
-    'isUpdate',
-    'isDelete',
-    'isBefore',
-    'isAfter',
-    'isUndelete',
-    'new',
-    'newMap',
-    'old',
-    'oldMap',
-    'size',
-    'operationType'
-  ];
-
-  const TRIGGER_CONTEXT_DECLARATION = {
-    match: [/\bTrigger\b/, /\./, regex.either(...TRIGGER_PROPERTIES), /\b/],
+  const TRIGGER_NAMESPACE_CALLS = {
+    match: [/\bTrigger/, /\./, /(isExecuting|isInsert|isUpdate|isDelete|isBefore|isAfter|isUndelete|new|newMap|old|oldMap|size|operationType)\b/],
     scope: { 1: 'built_in', 3: 'keyword' },
     relevance: 10
   };
@@ -841,15 +819,13 @@ export default function (hljs) {
     //begin: [/\bclass\b/, /\s+/, APEX_IDENT_RE],
     //beginScope: { 1: 'keyword', 3: 'title.class' },
     
-    beginKeywords: 'class',
-    returnBegin: true,
-
+    begin: /\bclass\b/,
+    beginScope: 'keyword',
     end: /\{/,
     endScope: 'punctuation',
-    returnEnd: true,
     //returnEnd: true,
     scope: 'class_declaration',
-    keywords: { type: TYPES, keyword: MAIN_KEYWORDS },
+    keywords: { type: TYPES, keyword: MAIN_KEYWORD_LIST },
     contains: [
       {
         match: [/(?<=\bclass\b)\s+/, APEX_IDENT_RE  ],
@@ -931,7 +907,7 @@ export default function (hljs) {
     contains: [
       COMMENT_LINE,
       COMMENT_BLOCK,
-      PUNCTUATION,
+      PUNCTUATION_RE,
       {
         match: regex.concat(/\b/, APEX_IDENT_RE, /\b/),
         scope: 'variable.constant'
@@ -963,27 +939,27 @@ export default function (hljs) {
   const DECLARATIONS = [
     TRIGGER_DECLARATION,
     CLASS_SHARING,
-    TRIGGER_CONTEXT_DECLARATION,
+    TRIGGER_NAMESPACE_CALLS,
     ENUM_DECLARATION,
     //CONSTRUCTOR_DECLARATION,
     CLASS_DECLARATION
-  ].concat(PROPERTY_DECLARATION);
+  ];
 
   const RETURNS = [
-    {
-      match: [/(?<=\breturn\b)\s+/, regex.either(LITERALS), /(?=\s*;)/],
+    /* {
+      match: [/\breturn\b\s+/, regex.either(LITERALS)],
       scope: {
         2: 'literal'
       }
-    },
+    }, */
     {
-      match: [/(?<=\breturn\b)/, /\s+/, APEX_IDENT_RE, /(?=\s*;)/],
+      match: [/\breturn\b/, /\s+/, APEX_IDENT_RE, ';'],
       scope: {
         3: 'variable'
       }
     },
     {
-      match: [/(?<=\breturn\b)/, /\s+/, regex.lookahead(APEX_IDENT_RE + /\(/)],
+      match: [/\breturn\b/, /\s+/, regex.lookahead(APEX_IDENT_RE + /\(/)],
       //returnBegin: true,
       //end: /(?=\))/,
       scope: {
@@ -1134,7 +1110,7 @@ export default function (hljs) {
             match: [/(?<=\.)/, APEX_IDENT_RE, /\b/],
             scope: { 2: 'type' }
           },
-          PUNCTUATION
+          PUNCTUATION_RE
         ]
       },
       {
@@ -1189,8 +1165,8 @@ export default function (hljs) {
       },
       NUMBERS,
       METHOD_CALL,
-      OPERATORS,
-      PUNCTUATION,
+      OPERATOR_RE,
+      PUNCTUATION_RE,
       hljs.APOS_STRING_MODE
     ],
     illegal: '::'
@@ -1203,7 +1179,7 @@ export default function (hljs) {
       2: 'punctuation',
       3: 'type',
       5: 'variable for',
-      6: 'operator'
+      //6: 'operator'
     },
     scope: 'for_loop',
     end: /\)\s*\{/,
@@ -1215,7 +1191,8 @@ export default function (hljs) {
       scope: 'variable'
     }],
     METHOD_CALL,
-    PUNCTUATION
+    PUNCTUATION_RE,
+    OPERATOR_LIST
    
   };
 
@@ -1244,7 +1221,7 @@ export default function (hljs) {
           match: [APEX_IDENT_RE, /\s*;/],
           scope: {1: 'variable'}
         },
-        PUNCTUATION,
+        PUNCTUATION_RE,
         COMMENT_LINE,
         SOQL_QUERY
       ]
@@ -1255,14 +1232,14 @@ export default function (hljs) {
      *
      */
     {
-    begin: [/\bDatabase\b/,/\./, APEX_IDENT_RE, /\s*/, /\(/],
+    begin: [/\bDatabase\b/,/\./, APEX_IDENT_RE, /\s*/, regex.lookahead(/\(/)],
     beginScope: { 1: 'built_in', 3: 'built_in'},
     end: ';',
     //endScope: 'punctuation',
     scope: 'database_dml',
     contains: [
       
-       PARAMS, LITERAL_REGEX, hljs.APOS_STRING_MODE, COMMENT_BLOCK, COMMENT_LINE,{
+       PARAMS, LITERAL_RE, hljs.APOS_STRING_MODE, COMMENT_BLOCK, COMMENT_LINE,{
         match: [/\(/, APEX_IDENT_RE,/,/],
         scope: {2: 'variable'}
       },{
@@ -1278,7 +1255,7 @@ export default function (hljs) {
         end: /\)/,
         scope: 'dml params',
         endsWithParent: true,
-        contains: [PARAMS, LITERAL_REGEX, hljs.APOS_STRING_MODE, COMMENT_BLOCK, COMMENT_LINE  ]
+        contains: [PARAMS, LITERAL_RE, hljs.APOS_STRING_MODE, COMMENT_BLOCK, COMMENT_LINE  ]
       } */
     ]
     }
@@ -1337,10 +1314,10 @@ export default function (hljs) {
     '%%>',
     '<%%',
     ':-',
-    //\bmergesort\(/,
-    //\bvar\s+env\b/,
-   //\bdef\b\s\W:/
-    // /"[^"]+"/, // Quote_string_mode
+    /\bmergesort\(/,
+    /\bvar\s+env\b/,
+   /\bdef\b\s\W:/,
+     /"[^"]+"/, // Quote_string_mode
     // /@\w+\[\w+\]/ //moonscript
   ];
 
@@ -1352,8 +1329,8 @@ export default function (hljs) {
     ignoreIllegals: false,
     keywords: {
       $pattern: APEX_IDENT_RE,
-      keyword: MAIN_KEYWORDS,
-      'variable.language': LANGUAGE_VARS,
+      keyword: MAIN_KEYWORD_LIST,
+      'variable.language': LANGUAGE_VAR_LIST,
       built_in: BUILT_INS,
       type: TYPES,
       literal: LITERALS
@@ -1375,13 +1352,14 @@ export default function (hljs) {
       METHOD_CALL,
       NAMESPACES,
       NUMBERS,
-      OPERATORS,
-      PUNCTUATION,
+      OPERATOR_RE,
+      PUNCTUATION_RE,
       RETURNS,
       SALESFORCE_ID,
       SOQL_QUERY,
-      STORAGE_MODIFIER,
-      SWITCH_STATEMENT
+      STORAGE_MODIFIER_RE,
+      SWITCH_STATEMENT,
+      VISUALFORCE_PROPERTY
     ]
   };
 }
diff --git a/test/markup/apex/apexcode.expected.txt b/test/markup/apex/apexcode.expected.txt
index b563d63..f1aede0 100644
--- a/test/markup/apex/apexcode.expected.txt
+++ b/test/markup/apex/apexcode.expected.txt
@@ -2,50 +2,50 @@
  * <span class="hljs-doctag">@author </span>John Smith
  */</span>
 <span class="hljs-annotation"><span class="hljs-meta">@IsTest</span><span class="hljs-punctuation">(</span><span class="hljs-meta keyword">Seealldata</span><span class="hljs-operator">=</span><span class="hljs-literal">true</span><span class="hljs-punctuation">)</span></span>
-<span class="hljs-keyword">public</span> <span class="hljs-keyword">with sharing</span> <span class="hljs-class_declaration">class <span class="hljs-title class_">L2Char</span> <span class="hljs-implements block"><span class="hljs-keyword">implements</span> <span class="hljs-built_in">Database</span>.<span class="hljs-title class_ inherited__">batchable</span> </span><span class="hljs-punctuation">{</span></span><span class="hljs-punctuation">{</span>
+<span class="hljs-keyword">public</span> <span class="hljs-keyword">with sharing</span> <span class="hljs-class_declaration"><span class="hljs-keyword">class</span> <span class="hljs-title class_">L2Char</span> <span class="hljs-implements block"><span class="hljs-keyword">implements</span> <span class="hljs-built_in">Database</span>.<span class="hljs-title class_ inherited__">batchable</span> </span><span class="hljs-punctuation">{</span></span>
   <span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-keyword">final</span> <span class="hljs-type">String</span> <span class="hljs-variable assigned">ERROR</span> <span class="hljs-operator">=</span> <span class="hljs-number">0x0001</span><span class="hljs-punctuation">;</span>
 
   <span class="hljs-annotation"><span class="hljs-meta">@InvocableMethod</span><span class="hljs-punctuation">(</span><span class="hljs-meta keyword">label</span><span class="hljs-operator">=</span><span class="hljs-meta string">&#x27;my invocable&#x27;</span><span class="hljs-punctuation">)</span></span>
-  <span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-type">void</span> <span class="hljs-method_call"><span class="hljs-title function_ invoke__">moveTo</span><span class="hljs-params"><span class="hljs-punctuation">(</span>
+  <span class="hljs-keyword">public</span> <span class="hljs-keyword">static</span> <span class="hljs-type">void</span> <span class="hljs-method_call"><span class="hljs-title function_ invoke__">moveTo</span><span class="hljs-params">(
     <span class="hljs-type">Integer</span> <span class="hljs-variable">x</span>, 
     <span class="hljs-type">Integer</span> <span class="hljs-variable">y</span>, 
     <span class="hljs-type">Integer</span> <span class="hljs-variable">z</span>
-  <span class="hljs-punctuation">)</span></span></span> <span class="hljs-punctuation">{</span>
+  )</span></span> <span class="hljs-punctuation">{</span>
     
     
-    <span class="hljs-type">Account</span> <span class="hljs-variable assigned">a</span> <span class="hljs-operator">=</span> <span class="hljs-instantiate"><span class="hljs-keyword">new</span> <span class="hljs-title function_ invoke__">Account</span><span class="hljs-params"><span class="hljs-punctuation">(</span><span class="hljs-punctuation">)</span></span></span><span class="hljs-punctuation">;</span>
+    <span class="hljs-type">Account</span> <span class="hljs-variable assigned">a</span> <span class="hljs-operator">=</span> <span class="hljs-instantiate"><span class="hljs-keyword">new</span> <span class="hljs-title function_ invoke__">Account</span><span class="hljs-params">()</span></span><span class="hljs-punctuation">;</span>
     a.Custom__c <span class="hljs-operator">=</span> <span class="hljs-string">&#x27;stringvalue&#x27;</span><span class="hljs-punctuation">;</span>
    <span class="hljs-dml"><span class="hljs-built_in"> insert </span><span class="hljs-variable">a</span>;</span>
     <span class="hljs-type">Boolean</span> <span class="hljs-variable assigned">ai</span> <span class="hljs-operator">=</span> <span class="hljs-punctuation">(</span><span class="hljs-type">Boolean</span><span class="hljs-punctuation">)</span> <span class="hljs-literal">false</span><span class="hljs-punctuation">;</span>
-    <span class="hljs-method_call"><span class="hljs-built_in">System</span>.<span class="hljs-title function_ invoke__">debug</span><span class="hljs-params"><span class="hljs-punctuation">(</span><span class="hljs-string">&#x27;Should not be called&#x27;</span><span class="hljs-punctuation">)</span></span></span><span class="hljs-punctuation">;</span>
-    <span class="hljs-method_call"><span class="hljs-title function_ invoke__">if</span> <span class="hljs-params"><span class="hljs-punctuation">(</span><span class="hljs-number">1</span><span class="hljs-operator"> &gt; </span><span class="hljs-number">5</span> <span class="hljs-operator">&amp;&amp;</span> <span class="hljs-operator">!</span><span class="hljs-built_in">Test</span>.isRunningTest(<span class="hljs-punctuation">)</span></span></span><span class="hljs-punctuation">)</span> <span class="hljs-punctuation">{</span> <span class="hljs-comment">// wtf!?
-</span>      <span class="hljs-database_dml"><span class="hljs-built_in">Database</span>.<span class="hljs-built_in">insert</span>(myAccounts, <span class="hljs-literal regex">false</span>);</span>
+    <span class="hljs-method_call"><span class="hljs-built_in">System</span>.<span class="hljs-title function_ invoke__">debug</span><span class="hljs-params">(<span class="hljs-string">&#x27;Should not be called&#x27;</span>)</span></span><span class="hljs-punctuation">;</span>
+    <span class="hljs-method_call"><span class="hljs-title function_ invoke__">if</span> <span class="hljs-params">(<span class="hljs-number">1</span><span class="hljs-operator"> &gt; </span><span class="hljs-number">5</span> <span class="hljs-operator">&amp;&amp;</span> <span class="hljs-operator">!</span><span class="hljs-built_in">Test</span>.isRunningTest()</span></span><span class="hljs-punctuation">)</span> <span class="hljs-punctuation">{</span> <span class="hljs-comment">// wtf!?
+</span>      <span class="hljs-database_dml"><span class="hljs-built_in">Database</span>.<span class="hljs-built_in">insert</span><span class="hljs-params">(<span class="hljs-variable">myAccounts</span>, <span class="hljs-literal regex">false</span>)</span></span><span class="hljs-punctuation">;</span>
     <span class="hljs-punctuation">}</span>
   <span class="hljs-punctuation">}</span>
 <span class="hljs-punctuation">}</span>
 
 <span class="hljs-meta">@TestSetup</span>
-<span class="hljs-keyword">private</span> <span class="hljs-keyword">static</span> <span class="hljs-type">void</span> <span class="hljs-method_call"><span class="hljs-title function_ invoke__">makeData</span><span class="hljs-params"><span class="hljs-punctuation">(</span><span class="hljs-type">Boolean</span> <span class="hljs-variable">a</span><span class="hljs-punctuation">)</span></span></span><span class="hljs-punctuation">{</span>
-  <span class="hljs-type">Custom__c</span> <span class="hljs-variable assigned">c</span> <span class="hljs-operator">=</span> <span class="hljs-instantiate"><span class="hljs-keyword">new</span> <span class="hljs-title function_ invoke__">Custom__c</span><span class="hljs-params"><span class="hljs-punctuation">(</span><span class="hljs-punctuation">)</span></span></span><span class="hljs-punctuation">;</span>
+<span class="hljs-keyword">private</span> <span class="hljs-keyword">static</span> <span class="hljs-type">void</span> <span class="hljs-method_call"><span class="hljs-title function_ invoke__">makeData</span><span class="hljs-params">(<span class="hljs-type">Boolean</span> <span class="hljs-variable">a</span>)</span></span><span class="hljs-punctuation">{</span>
+  <span class="hljs-type">Custom__c</span> <span class="hljs-variable assigned">c</span> <span class="hljs-operator">=</span> <span class="hljs-instantiate"><span class="hljs-keyword">new</span> <span class="hljs-title function_ invoke__">Custom__c</span><span class="hljs-params">()</span></span><span class="hljs-punctuation">;</span>
   
-  <span class="hljs-for_loop"><span class="hljs-keyword">for</span><span class="hljs-punctuation">(</span><span class="hljs-type">Account</span> <span class="hljs-variable for">a</span><span class="hljs-operator"> :</span> <span class="hljs-variable">acctLis</span> <span class="hljs-punctuation">){</span></span>
+  <span class="hljs-for_loop"><span class="hljs-keyword">for</span><span class="hljs-punctuation">(</span><span class="hljs-type">Account</span> <span class="hljs-variable for">a</span> : <span class="hljs-variable">acctLis</span> <span class="hljs-punctuation">){</span></span>
     ConnectApi.<span class="hljs-built_in">insert</span> a<span class="hljs-punctuation">;</span>
   <span class="hljs-punctuation">}</span>
 <span class="hljs-punctuation">}</span>
 
 <span class="hljs-meta">@isTest</span>
-<span class="hljs-keyword">private</span> <span class="hljs-keyword">static</span> <span class="hljs-type">void</span> <span class="hljs-method_call"><span class="hljs-title function_ invoke__">testme</span><span class="hljs-params"><span class="hljs-punctuation">(</span><span class="hljs-punctuation">)</span></span></span><span class="hljs-punctuation">{</span>
-  <span class="hljs-method_call"><span class="hljs-built_in">System</span>.<span class="hljs-title function_ invoke__">assert</span><span class="hljs-params"><span class="hljs-punctuation">(</span><span class="hljs-literal regex">true</span><span class="hljs-punctuation">)</span></span></span><span class="hljs-punctuation">;</span>
+<span class="hljs-keyword">private</span> <span class="hljs-keyword">static</span> <span class="hljs-type">void</span> <span class="hljs-method_call"><span class="hljs-title function_ invoke__">testme</span><span class="hljs-params">()</span></span><span class="hljs-punctuation">{</span>
+  <span class="hljs-method_call"><span class="hljs-built_in">System</span>.<span class="hljs-title function_ invoke__">assert</span><span class="hljs-params">(<span class="hljs-literal regex">true</span>)</span></span><span class="hljs-punctuation">;</span>
 <span class="hljs-punctuation">}</span>
 
 <span class="hljs-meta">@testVisible</span>
-<span class="hljs-keyword">private</span> <span class="hljs-collection"><span class="hljs-type">List</span><span class="hljs-punctuation">&lt;</span><span class="hljs-type">SelectOption</span><span class="hljs-punctuation">&gt;</span></span> <span class="hljs-property">recordTypes</span> { <span class="hljs-keyword">get</span><span class="hljs-punctuation">;</span> <span class="hljs-keyword">private</span> <span class="hljs-keyword">set</span><span class="hljs-punctuation">;</span> <span class="hljs-punctuation">}</span>
+<span class="hljs-keyword">private</span> <span class="hljs-collection"><span class="hljs-type">List</span><span class="hljs-punctuation">&lt;</span><span class="hljs-type">SelectOption</span><span class="hljs-punctuation">&gt;</span></span> <span class="hljs-property">recordTypes</span> <span class="hljs-punctuation">{</span> <span class="hljs-keyword">get</span><span class="hljs-punctuation">;</span> <span class="hljs-keyword">private</span> <span class="hljs-keyword">set</span><span class="hljs-punctuation">;</span> <span class="hljs-punctuation">}</span>
 
-<span class="hljs-for_loop"><span class="hljs-keyword">for</span><span class="hljs-punctuation">(</span><span class="hljs-type">Account</span> <span class="hljs-variable for">a</span><span class="hljs-operator"> :</span> <span class="hljs-soql"><span class="hljs-punctuation">[</span><span class="hljs-keyword soql">SELECT</span> Id <span class="hljs-from_clause"><span class="hljs-keyword">FROM</span><span class="hljs-type"> Account</span></span> <span class="hljs-keyword soql">WHERE</span> LastModifiedDate <span class="hljs-operator">=</span> <span class="hljs-variable language_">LAST_N_DAYS</span><span class="hljs-operator">:</span><span class="hljs-number">3</span><span class="hljs-punctuation">]</span></span><span class="hljs-punctuation">){</span></span>
-  <span class="hljs-method_call"><span class="hljs-class title_">Assert</span>.<span class="hljs-title function_ invoke__">fail</span><span class="hljs-params"><span class="hljs-punctuation">(</span><span class="hljs-punctuation">)</span></span></span><span class="hljs-punctuation">;</span>
+<span class="hljs-for_loop"><span class="hljs-keyword">for</span><span class="hljs-punctuation">(</span><span class="hljs-type">Account</span> <span class="hljs-variable for">a</span> : <span class="hljs-soql"><span class="hljs-punctuation">[</span><span class="hljs-keyword soql">SELECT</span> Id <span class="hljs-from_clause"><span class="hljs-keyword">FROM</span><span class="hljs-type"> Account</span></span> <span class="hljs-keyword soql">WHERE</span> LastModifiedDate <span class="hljs-operator">=</span> <span class="hljs-variable language_">LAST_N_DAYS</span><span class="hljs-operator">:</span><span class="hljs-number">3</span><span class="hljs-punctuation">]</span></span><span class="hljs-punctuation">){</span></span>
+  <span class="hljs-method_call"><span class="hljs-class title_">Assert</span>.<span class="hljs-title function_ invoke__">fail</span><span class="hljs-params">()</span></span><span class="hljs-punctuation">;</span>
 <span class="hljs-punctuation">}</span>
 
 <span class="hljs-trigger_declaration"><span class="hljs-keyword">trigger</span> <span class="hljs-title class_">CTrig</span> <span class="hljs-operator">on</span> <span class="hljs-type">Custom__c</span> <span class="hljs-trigger_params"><span class="hljs-punctuation">(</span><span class="hljs-built_in">before insert</span><span class="hljs-punctuation">)</span></span></span><span class="hljs-punctuation">{</span>
-  <span class="hljs-method_call"><span class="hljs-built_in">System</span>.<span class="hljs-title function_ invoke__">debug</span><span class="hljs-params"><span class="hljs-punctuation">(</span><span class="hljs-string">&#x27;inserting a record&#x27;</span><span class="hljs-punctuation">)</span></span></span><span class="hljs-punctuation">;</span>
+  <span class="hljs-method_call"><span class="hljs-built_in">System</span>.<span class="hljs-title function_ invoke__">debug</span><span class="hljs-params">(<span class="hljs-string">&#x27;inserting a record&#x27;</span>)</span></span><span class="hljs-punctuation">;</span>
  <span class="hljs-dml"><span class="hljs-built_in"> upsert </span><span class="hljs-variable">myRecord__c</span>;</span>
 <span class="hljs-punctuation">}</span>
\ No newline at end of file