some code clean-up
some code clean-up