Some corrections to comply with PEP 8