Cleanup and Readme updates