small structural edits