Some coffee refactoring.