the previous one, part two!

I believe this is what is referred to as "refactoring?"