Adding in image editor classes, cleanup function