type/spelling cleanup
remove use of unfashionable StringTokenizer
checkstyle cleanups