Fixing some coding standards issues