Refactoring, debugging