Remove redundant check and changed some comments