Switch to coffee
Clean up