improved naming an refactoring