LPS-42107 style fixes