PEP8 cleanup

Some minor modifications to match the PEP8 style guidlines