Reformat per PEP 8, fixed some typos