reorganized a tad