Cleanup.

Javadoc, since tags, imports...