Some light editing