#16: Added team players, style cleanup