Readme cleanup.
More code cleanup.