Implementing AnimusWorld, cleaning code.