Clean up coffee source a bit.