code/comments cleanup