Fix code block and remove TODOs