Refactored saving and tidied up a bit