Fixing defects.
Refactoring.