Aaaand removing extra whitespace