Tidy up of code plus new teams added