Yup, can simplify that as you suggest.