(refactor) Refactored handler for cleanliness.