some code cleanup
code cleanup