code clean up
code cleanup 2