- structural improvement
- javadoc for annotations