cleanup
Model base class improv with decorator