Remove unnecessary comment and rewrap a few lines