renaming / minor refactoring