A bit more refactoring, might as well get the name just right
6 files changed