Mixins : Replace manual hacks with mixins