More whitespaces fixes