Make comments more readable, remove whitespaces