comments and code tidy for bench demo