Various syntax tweeks
Merge pull request #18 from Yahkob/syntaxLinting

Various syntax tweeks