Add `methods` as a dependency
Clean up some code