Change according @tonysyu suggestions and run PEP8