* change `if` condition instead of boolean operator `&&`
- fix indent spaces