Refactor round 2