Refactoring.
Cleaning up.