Updated formatting to be closer to PEP8 style guidelines