Touch up whitespace and other small issues from inspection
merge to keep track with zxing/zxing git