zhou86 & zhang250: refactor and commenting

updated comment format