Syntax and spacing cleanup