Incorporated cleaner graphics handling.