Cleaned mess, added Creatures initial class