Add a TODO and tidy up a bit