Code cleanup in cleanSig