Fix coding style plus make messages translatable

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>