Refactor for cleanliness