clean up style, types. More work needed.

We could probably replace this module with an import at this point. Someone must have implemented somewhere.