Minor refactoring & renaming