Clean up spaces and missing semi-colons