Code style fixes
Update submodules