Get rid of unnecessary whitespace and fix spacing