ImageFormat cleanup & comments