minor clean-up of javadocs formating and unused imports