Clean up whitespaces a bit
Some styling