Made changed to adhere to PEP standards