Fix Code Size PMD warnings
Fix Code Size PMD warnings