Finalize after code review