More nitpicky changes