Refactor coffee