Style changes + update submodules