readability refactoring
Few more tests
removed redundant code