Improved whitespace and semicolons