Refactor of Easing