Fixed PMD issues - fixed possible bug with erroneous parentheses