Use helper functions inside of if statements
Fix jshint warning
Increase version to 0.6.9