Code cleanup and making JSLint happier.