mainly cosmetics

Signed-off-by:  <st9fan@gmail.com>