Yup, DRY now. DONE.