ditch: Cleanup comments and remove redundant check
ditch: Add a bit more documentation, clean it up and some a little more robustness