Some coding style update

(not ready to merge)