LPS-42340 Style fixes