update formatting & comments