Readme updated, code cleanup.