- resolved some jshint warnings