Code/comments cleanup.