Added jshint support during test phase + cleanup code to be compliant