More style fixes (and removal of a duplicate method)