Reviewed all remaining TODOs