Hi, I've started refactoring using Gerd's suggestion - check out the "FE_REFACTORING" branch in CVS. I've done tda1004x so far and I'm working on the cx22702.