* Refactorings and name clean ups.