Add validation to make sure a match has at least 2 players, and cleaned up the controller