Refactored
Extracted to concerns