TODO
Simplify coffee code