PMD Code Review + Formatting