Fixes model .save() losing relationships
Minor refactoring in uneeded ifs