BZ cleaned up editor