cleanup some strings

Change-Id: Ia0d2dd045548e168c3920aa4fd3a065842d9e583