Refactor class name
Refactor: Remove some duplication