command refactoring and scoreboard