code cleanup
more cleanup
submod
submod II