refactoring annimation towards decorator