Refactoring completed...