- Improved java docs for reports
- Removed redundant code