Tidy up and toy type added.