Corrected a comment
Implemented conditional return.