Make setup command code sligthly more readable