remove unused allteams var, fix some spacing