some code cleanup
some code cleanup