minor formatting and tightening