fix typo and some cosmetics

Change-Id: I7cb806f52e51523e61d58569fa38823a8d33628b