- code cleanup
- more javadoc