More style changes. This is gruesomely painful to do.