benchmark, minor cleanup