Minor code cleanup
Overhauled TODO