More refactoring of creature.py as prep for #40