#648 PEP8 corrections