Refactoring.
Refactoring and fixing.