Editted some comments