Syntax fixes + code style fixes