Use whitespaces a little bit more consistently

Need to create a tool soon.