Cleaned and changes some strings

Change-Id: I7ed2cba0204b3ba6190f9f84f5dd6391388ef86b