Correcting some coding standards issues