fix comments and wrap line