code/comment cleanup pt1