review comments: ordering, todo marker