Refactoring and better delta information