Added brackets to single-line if
Reduce redundancy between tests, split line of public static final Strings