Refactoring and What's Next