Touchups.
Refactoring: file organization
Typos.