Removed commented prints
Removed duplicated condition.