Refactor mixin section etc