Clean up strings

Change-Id: I02a489dabe884f07dc959f84d4fa921fcccbfa9c
Signed-off-by: Tianrui Guo <tianruig@gmail.com>