JSLint-ified AGAIN :)