Little mixin rename, code reshuffle a bit..