Image available method re-factored and optimized (partially)