CF #10 - Kind of follow PEP8