Added mixins and fixed indentation