Mayor refactoring, using named parameters