Code formatting cleanup for other module files

Nothing special here except import and formatting fixes. Almost all
files will need some serious cleanup still as they all have the
non-importable invocation style and multiple classes in one file.