small refactoring / rename