Respond to review comments

- Drop redundant code
- More tests