Tightening up edits