LPS-39139
LPS-39139 Source formatting
LPS-39139 Rename method