Make use of FP mixins and move into separate module