Mass changes
Refactoring.