certimporter improvements from code review