Properly fixing whitespace