INF-2529 Clean code, taking in account java best practice

Updated the messages