LPS-32031 Source formatting
LPS-34101 fix blank pages on jetty for 404; refactored code
LPS-34101 Source formatting