Added PEP-8 compliancy