Fixing PMD complains