PEP8
Another stab at this.