Refactoring finished!