Clean-UP TODOs

Added TODOs
Ran Clean-Up