Making whitespace better