- Changing comment string from '#~' (Geany) to standard
- Not taking extreme care for line lengths (pep8 --ignore=E501)
- Marginal changes to code (instead of "not x in y" we now use "x not in
  y")