Tidy up, comments, fork me ribbon