Cleanups in response to code review

- Organize imports
- Combine URL patterns (could have sworn I tried that before, but it's working
  now)
- Use _lazy