whitespace + remove old comments