modal: Get rid of animation modifier

With additional tiny refactoring