Updated/cleaned some comments