Code clean-up - Fix missing Javadoc tags - Correct indent - Consistent use of file() - Add {} to improve readability This is part of the fix for CVE-2017-12615