Merge "Refactorings to make code easier to navigate"