trivial changes in using bufio.Scanner