More small comments and cleanup.