minor refactoring.
update submodule