some code clean up
some more