Added MessageFormat as a dependency (i18n).
Code clean up