Resolved a TODO
Minor cleanup