Better resolution image; tidy code