Refactored editor classes.