Athlete Teams tidied up