small refactoring, naming conventions