Refactoring.
For saving, will squash.