More style changes... remove unnecessary code.