Update, in accordance with PEP8