- code cleanup
- ref #82