Improve trailing whitespaces

Signed-off-by: Qian, Hai <hqian@gopivotal.com>