Add TODO and some whitespace cleanups