added better indenting and submodules