Code cleanup and improved ReadMe