Tightening up formatting