Code

submodule add: clean up duplicated code