Reverted back to cheerio.Tidying up