Edits from Pythonista