Fix PMD short variable
Fix PMD long variable