Replace success var with return
Under the hood: remove index-key name of properties in model