add comment and removed useless condition