Syntax fixes and style