code/comment cleanup