LPS-30425 - Move methods to module and private function