zhang250 & zhou86: refactor

improved format