Cleaned up separation of concerns in the newly refactored mice.