Following jshint suggestions