Syntax/style fixes