Rename functions to helpers and add mixins