Partial refactor of organism logic use