Re-orged some model formatting
Removed unneeded user_reports model - artifact of the has_many, through: effort