Refactoring for cleanliness.