Syntax + Formatting cleanup