Formatting and JSLint cleanup