Moar mixins and semplification

Signed-off-by: Luca Degasperi <me@lucadegasperi.com>