LPS-51300 Fix source formatting errors and make it easier to calculation of the score