Various refactorings…