more cleanup to comments and small code change