more code cleanup
code cleanup