Bit of clean up on image.s