-Cleared out some old TODOS
-Eliminated some comments