review of pre-patch code showed a few cleanup points