Cleanification of models and pulls little more logic out of app; good enough