minor cleanup in model