Move data save load to separate class