LPS-41890 - Visual and performance improvements
LPS-41759 Fix source formattting
LPS-41759 Wrong input
LPS-41759 Minor change