Grouped all saves into one place and removed a few calls