Apply reviewer comments

- More documentation
- Remove handling of case 1 and 6, because they can't happen