Updated README. Some code cleanup.