Tidy up, and prevent need for separate Eloquent model bootstrapping