Minor code cleanups based on IntelliJ's code analysis
Added I18N helper class