PMD Code Review + Cleanup