A few format fix based-on @haoyuan feedback.