Cleanup: Turned redundant save model code into a method