Minor cleanup + TODO update