LPS-17439 Go with util pattern
LPS-17439 fix broken jspc
LPS-17439 Source formatting