Bring back lost whitespaces and comments