cleanup coffee-infected code a bit
no need to call function __ internally
80 chars in line