PMD Code Review + Javadoc + Formatting