Emphasis bugfixes.  PEP8'ified!