LPS-51930 Encapsulate logic in existing method