Cleaned up the editor support bit