- Sean's comments
- Cleanups