Updated in accordance to PEP-8