Complete setup command refactor