Sample data cleaned up, roster list sorting