Re-factored wow, such re-factor, very nice