fix typos and remove obsolete comments