part of WELD-1398 - Add missing braces in IF and FOR statements
part of WELD-1398 - simplify boolean expression and return
part of WELD-1398 - add private constructor in utility classes to hide the default one
part of WELD-1398 - remove MultipleStringLiterals (+ add switch default)