refactor $cpu selection in various places