Some formatting changes to comply with PEP8