nits, and moved more to mixins file