A little cleanup of rubber tree gen