make models less convoluted