Obt verify pass

- Clean up (commented code hasn't been updated in 6 months)
- Fix whitespace