Refactored (extracted methods)