simplify the code by removing unnecessary check

Excessively comment the code :)