Use snake case everywhere
Update TODO