cosmetic changes, updating some comments for correctness