Aravind | Moved messages to resource bundle.
Aravind | more refactoring.