Further code cleanup.
Update README