Code/commenting cleanup.