Updated for PEP8