Remove unnecessary fat arrows, semi-colons, and reformat to use 2 spaces