Update Readme and code cleanup.