Tidy up image structure