Refactoring for better names