Cleanup and readme.md update