Cleanup and editing works everywhere