Adjusted to pass PMD tests