Minor changes.
Refactoring classes.
Further refactoring.