- fixes issue #90
- some cleanup