use mixins for animations
tidy up