integrate minor code review feedback; cleanup TODOs