Spruce up the formatting and use the CINCH name consistently.