Working livescore, refactored