More style changes, beginning definitions functionality