Make test code more simple.
Make main code more simple.