Code and comments cleanup.