Refactor: Naming and method extraction
Refactor