PEP8 + cleanup.
travising