removing comments, name change