Small adjustments to adhere to PEP-8