Refactor names and implementation
Rename variables, method name