Refactor save slightly.