Set of cleanup commits

Sequence of cleanup commits that address warnings and suggestions found in IntelliJ.