some code clean-up
code cleanup
code cleanup