#85 converted a few low-hanging fruit classes to Java