Got rid of model factory, fixed linting errors.