comment and name clean ups