Code clean up of setup.