Started work on cleaning up any possible connections between DOM and JS.