Added TODO and cleanup.