Cleanup style warnings