Remove trailing whitespaces and changed comments