First editor pass