Refactored (removed) code
Refactoring