Fixed some coding style issues