minor updates, eg replacing '== None' to 'is None'