Quick plug to write a test first, then do the refactor according to your schedule. It's such a common feeling to want to fix the code while you're refactoring it, but that's often a bad idea. Test it first, then refactor it in place (without changing the outcome), then work on fixing it later.