Small improvements

Same as above comment. Why remove the reference to the image view?