ENH reduce amount of boiler code using standard operation