* Remove the unnecessary code lines

* Remove reduant empty line

* Complete the todo task

* Add more test cases

* Adjust the test data