Oklahoma Ave. safety improvement plan in final stages