cleanup + javadoc
10 files changed