Reorganized, resequenced, removed redundancies