Small refactorings. Next is to nagivate all projects recursively.