Refactored rotary check into tc
Minor cleanups and renames