A bit of namespace tidying, PEP8'n, and config'n.