We'll respond shortly.
Never be afraid to refactor. It may seem scary right now, but it will only become more daunting as the code base increases in size.
The right time to refactor is NOW… grasshopper
And now that my pair and I have rallied around this post, to the refactoring!