Image cleanup, changes for consistency