Refactoring and debugging.