redundant underscore removed
Merge branch 'coffee-cleanup'