Initiating a new refactoring...