gh-42 Cleaned up code base and broke single file client into pep8 sytle
module.