Functions cleanup
Add a TODO