Refactoring effort on body save/load