Little more refactoring after pairing with @variousred