Refactoring
Added single week scoreboard