Taking the time to refactor when we can is a good thing:)