Formating changes
Start using ResourceBundle for messages