Refined token-util & updated repo