improved readability & some new tests