Code cleanup and readme.md
Code cleanup and readme.md