Plip 13260 site feedback refactor