Cleaned up some comments, TODOs, etc.