Changed to new Coding Style

Changed code to new coding style
Added option to remove "messages" from yml