Syntax fixes so code is inline with auto style corrections