cleaning up form to be one mixin