More significant changes to adhere to PEP-8