More coffee refactoring.