pushed some of the beforeSave upstream and cleaned up more