Small refactor and renaming