Tidy whitespace and semi-colons.