cleaded up editing