Doc and code cleanup.