Code cleanup and additions to readme file