It was causing issues getting the arguments. As far as refactoring, I'm for it, just not right now :-)