Improve edit