trim comments, fix styling