Cleaned up organism.h