Style updated to PEP-8