little cleanups in the setup