minor structural cleanup
removed obsolete TODO