Remove trailing spaces + fix comments