Cleaning up minor TODO issues
Cleaning up TODO issues