cleaned setup