continued coffee refactoring