Small refactoring and renaming