Readme updaet and some more code cleanup.