Added team number to user accounts, cleaned and formatted code