Made indentation/spacing style consistent with the resto of the codebase. Removed color space conversion from calibrated to device.