Complete code review