Fixed some coding standards