Remove whitespace
Syntax consistency adjustments