Comments and code cleanup.