Refactoring Factorial

I'm refactoring some code that another fellow refactored, but which didn't quite come out to match the design that I had in my head. I think it's better now. I'll know for sure when it's done and I see how it runs.