Made the Lists more Organized