changes to match pinax standard of PEP8