cleaning up style sheet, adding less mixins