Changed some submodule stuff
Improvements to formatting style