Comments addressed

Closes #1.
Can we use util-is instead of doing this though?