Cleanup and Update readme