Minor code and file cleanup
Minor update to model relationships