Fix comments & return
1.0.1