tidy up and compile into site.yml