Tidy up comment stuff a bit
Give @guerremdq credit for the comment parameter