fixed warnings and moved SyntaxHelpers out to new file