clean setup a little