Refactor passle token