minor refactoring / renaming