cleanup and a couple more comments