Clean up and changes to the readme

Change-Id: I1242e4986d4ddfc19fab290b6ba6cb4c993c2af9