More refactoring with Reek