Minor cosmetic refactorings
Update repositories and dependencies sub-modules