fixed style and squashed all jshint bugs