Changed code to list of TODOs