Improved Coding style
Improved Coding style, fixed message