Refactoring: better function names