Refactoring: remove unused code, rename class for better clarity and consistency