code cleanup
code cleanup #2
code cleanup #3