Hinting clean up