Refactor the way ResourceBundle are used for internationalization