tweak formatting & comments