misc code cleanup
misc code cleanup
misc code cleanup