Tidy up + new team