Cleaned up roster scaffold