Pause/restart, score refactoring