Typo changes and reorganized mixins