Updated to valid with JSLint 100%