Rename doit and fix handler call with location