Some cleanup to make README readable and avoid clutter