Remove unused  code
Improve the test
Update the README