Consistency in relationship definition
Code cleanup in the Models and in the routes file