more refactoring/spelling issues