Refactoring never hurts...done.