Version 0.16.4
- code cleanup