Readme updated. And Code cleanup