LPS-50049 Source formatting
LPS-49294 Make fields final
Source formatting