Code cleanup

code cleanup