Reformat for thon-thinker lib updates