Refactoring

Various refactoring.