Refactored - extracted methods
Refactored