Refactored slightly to satisfy PEP8 and fix broken package name.