Format whitespace better