Syntax & style fixes