Fixed actor description position, minor refactoring