simplify mixins
remove additional spacer