code cleanup
code clean up