code cleanup

code cleanup