refactoring & renaming