[BUG #7810] jshint and minor refactoring
[BUG #7810] rectify dependencies