Refactoring.
Documenting section 3.2.1 code.