Added submodule + Code Tidy up