clean up setup a bit