- additional speed-up (issue #77)
- code cleanup