Make code more consistent actross all benchmark apps