- some simplification
- add documentation to make javadoc