minor whitespace fixes
initial syntax cleanup