Comments and cleanup.