cleanup

code clean up