Addressing issue #296. General PEP8ing.