cleaned up jshint warnings and errors