Small code improvements to StepImageFragment