Improve code coffee