pep8 fixes
Per #743, this fixes the missing diamond.utils subpackage