Tidy up mixins section