Refactored content loading, saving.