review comments and some more cleanup