Due to various changes in the JavaScript files some coding has become obsolete while other code is not as readable as one would expect.

I'll create a PR soonish which will contain my suggested changes.