Feature/jslint

Make code JSLint compliant