Some refactoring and better jump anim