Minor clean up, adds todo