Coffee fix2

Fixed CLA issues (I think), and added additional commits to comply with @bajtos requests.
Style: we don't use an extra newline at the start of the function bode, please remove.