cleaned up cmp & nimoy