Inclusion of comments and refactoring the test cases