Fix PMD and Findbugs Warning