Updated Readme
Code cleanup