Light refactoring
Standings reworked