Fixing style warnings