PLD: refactor and remove duplicate method