cleaning up and finalizing CTA mixins