Added some coding style corrections