Whitespace fixes and remove ugly colored line