Adjustments for PEP-8 compliance