Some code comments and cleanup.