Cleanup with model constructors