Follow jshint suggestions