More PEP8. Issue: #4