It might not be the prettiest, but it's not terrible. I'm very wary of doing a refactor like you suggest at this point in time. I want to correct the logic, but with the least amount of changes possible so we aren't far from the code that's been staged for the past few weeks. 

I'm all for refactoring when we are working in this part of the code again and have good stage time.