Cosmetic changes on old code and new code from TS-2682