Update according to PEP-008 standards