Cleanup and some comments on work to do