Fixing some typos, also PEP8'ed, also .format()'d