cleaning up

code clean up