A couple nitpicky improvements