minor simplifications
- fixed some typos
- removed some redundant checks
- increased clarity (hopefully ...)