I appreciate this refactoring!