More style/ comment clean up