Cleaning up setup script a bit.