Simplify animation handling