Correction to readme and small code cleanup.