Code cleanup, test parameter selection.