Minor cleanup edits