Minor format update, some doc improvement