Switch bourbon over to coffee, cleanup grunt