stricter jshint + refactoring