Final editing pass