Code/comment cleanup.