refactor hints to use cheetah template