Code Cleanup

code cleanup