Refactor for cleanliness.