Completed some modest tweaks to new Data Matrix code based on IntelliJ suggestions