minor cleanup to comments, logging