scalastyle did not seem to complain, so I left in the order Intellij pulled them in. Is there a style we use for this? I can sort it in the next iteration, once some more code comments come in.