Cleanup and samples reordering in Mains