Add comments and remove TODOs