Doing some cleanup and updating readme.