Overall style improvements