Do some light edits