Now that's some refactorinoz