Cleans up some code.

Thanks,
- Tom