code cleanup

co