2-step image loading and little cleanup