Minor changes, comments and code clarification

- Cutpoint selection rewritten (simpler)
- A few TODO items added as code comments (not docstring)
- Double quoted strings