minor improvement for setup