Remove self so it's more clear