Refactored for clean reading