Fixed (most) style warnings