MAssive reformatting to comply with PEP