Cleaned up Loading / Saving logic

general code cleanup
removed redundant function from the view