comments and minor clean-up