You know what they say -- refactoring makes perfect.