Stop in for a cup of coffee

Cleaned it up a bit. Old and new.