remove un-necessary 'is not None' from conditionals