cosmetic cleanup
...
Fix #16