Improved editor output