Thinnen the helper lines and clean constants