Fixed recommendations to match PEP8