A bit more refactoring! Everyone loves a little bit of refactoring.