cleaning up the code and test cases
cleaning up the code and test cases