Fixed as per review comments
- remove break -- that was buggy
- added comments