Added surround and jshint