Refine the todo items and implementation details