Code cleanup
Update Readme