refactoring to be proper name