Fix comment and chompify