Simplification and performance enhancement. Testcase improvement.