Improve JavaDoc and remove unused imports