LPS-32484 Simplify
LPS-32484 JavaDocs