More refactors for cleanliness.
Readme.