tidied up nimoy