Added some tidy up todos