Ok, refactored!