Modify the code according to the code review. This version is not yet functional because of some bug.