Review by core: Removed trailing spaces base on coder review