LPS-30715 Move fix logic  into a more generic place
LPS-30715 Source formatting