Code cleanup, adding transition mixin