small refactoring for better naming