Code and comment cleanup.