Incorperated reformatting suggestions from PyCharm