Tidied up save/load methods.